Allow NULL for strings to clear the list. (#105386, Marco Pesenti Gritti)

Fri Jan 30 00:13:46 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL
	for strings to clear the list.  (#105386, Marco Pesenti Gritti)

diff --git a/ChangeLog b/ChangeLog
index 8b8d583eb7f143c545bf330662e3ac76745429e5..dcc1c5e9f84f8d9779d46d9d94ba117dcc08aa2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 30 00:13:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL
+       for strings to clear the list.  (#105386, Marco Pesenti Gritti)
+       
 2004-01-28  Richard Hult  <richard@imendio.com>
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8b8d583eb7f143c545bf330662e3ac76745429e5..dcc1c5e9f84f8d9779d46d9d94ba117dcc08aa2c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Jan 30 00:13:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL
+       for strings to clear the list.  (#105386, Marco Pesenti Gritti)
+       
 2004-01-28  Richard Hult  <richard@imendio.com>
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8b8d583eb7f143c545bf330662e3ac76745429e5..dcc1c5e9f84f8d9779d46d9d94ba117dcc08aa2c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Jan 30 00:13:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL
+       for strings to clear the list.  (#105386, Marco Pesenti Gritti)
+       
 2004-01-28  Richard Hult  <richard@imendio.com>
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8b8d583eb7f143c545bf330662e3ac76745429e5..dcc1c5e9f84f8d9779d46d9d94ba117dcc08aa2c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Jan 30 00:13:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL
+       for strings to clear the list.  (#105386, Marco Pesenti Gritti)
+       
 2004-01-28  Richard Hult  <richard@imendio.com>
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8b8d583eb7f143c545bf330662e3ac76745429e5..dcc1c5e9f84f8d9779d46d9d94ba117dcc08aa2c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Jan 30 00:13:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL
+       for strings to clear the list.  (#105386, Marco Pesenti Gritti)
+       
 2004-01-28  Richard Hult  <richard@imendio.com>
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size):

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 1a31ba5151c7f777564da7314bfb3fbe8add8b21..f44827c86fde69034b07c05eea1cb517b228b4ef 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 30 00:27:36 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/tmpl/gtkcombo.sgml: Document clearing the list with
+       gtk_combo_set_popdown_strings().
+
 Wed Jan 28 22:51:41 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/tmpl/gtktreeviewcolumn.sgml: Remove unfinished sentence, until

diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml
index d1436e337adf6b9ae2b25910eb0414b92f797037..5263ac2d7760d6aa15eb8eac7e5ff028c8ed805d 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkcombo.sgml
+++ b/docs/reference/gtk/tmpl/gtkcombo.sgml
@@ -146,7 +146,7 @@ Convenience function to set all of the items in the popup list.
 </para>
 
 @combo: a #GtkCombo.
-@strings: a list of strings.
+@strings: a list of strings, or %NULL to clear the popup list
 
 
 <!-- ##### FUNCTION gtk_combo_set_value_in_list ##### -->

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 9282473c4fd228d9f3a3d90f045262bf4c1ad6d7..0fadeb9b613e1956606d95c255ac8706a0729a55 100644 (file)
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -1109,13 +1109,13 @@ gtk_combo_set_use_arrows_always (GtkCombo * combo, gboolean val)
 }
 
 void
-gtk_combo_set_popdown_strings (GtkCombo * combo, GList * strings)
+gtk_combo_set_popdown_strings (GtkCombo *combo, 
+                              GList    *strings)
 {
   GList *list;
   GtkWidget *li;
 
   g_return_if_fail (GTK_IS_COMBO (combo));
-  g_return_if_fail (strings != NULL);
 
   gtk_combo_popdown_list (combo);